dateMenu: Use desktop action to open Evolution calendar

We include a private hidden .desktop file for evolution's calendar
component, so that we can explicitly open that component when
evolution is configured as the default calendar application.

That's because the evolution developers didn't want to ship
additional .desktop files at the time, but they have since
then included a desktop action that can be used for the same
purpose.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2479>

diff --git a/.gitignore b/.gitignore
index 396a628e51a6267bed607695eae3fea2c0a90aac..f692b4944639ee44634c18cb3f60508ff1d398b6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -56,7 +56,6 @@ src/*.gir
 src/*.typelib
 src/*-enum-types.[ch]
 src/*-marshal.[ch]
-src/calendar-server/evolution-calendar.desktop
 src/calendar-server/org.gnome.Shell.CalendarServer.service
 src/gnome-shell
 src/gnome-shell-calendar-server

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 2c44f0c4fb65e2ac08a073bd53e1809888abaa25..96458d2fdfbfa8b11bd2d13f3c026e08dc29f4fa 100644 (file)
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -284,13 +284,12 @@ class EventsSection extends St.Button {
         Main.overview.hide();
         Main.panel.closeCalendar();
 
-        let appInfo = this._calendarApp;
-        if (appInfo.get_id() === 'org.gnome.Evolution.desktop') {
-            const app = this._appSys.lookup_app('evolution-calendar.desktop');
-            if (app)
-                appInfo = app.app_info;
-        }
-        appInfo.launch([], global.create_app_launch_context(0, -1));
+        const appInfo = this._calendarApp;
+        const context = global.create_app_launch_context(0, -1);
+        if (appInfo.get_id() === 'org.gnome.Evolution.desktop')
+            appInfo.launch_action('calendar', context);
+        else
+            appInfo.launch([], context);
     }
 
     _appInstalledChanged() {

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 88409eb95c050fd3a624c01dd131caadb565080c..431580bb0cb54901a188ac2e1ceeab688cbbb10b 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -79,7 +79,6 @@ js/ui/welcomeDialog.js
 js/ui/windowAttentionHandler.js
 js/ui/windowManager.js
 js/ui/windowMenu.js
-src/calendar-server/evolution-calendar.desktop.in
 src/main.c
 src/shell-app.c
 src/shell-app-system.c

diff --git a/src/calendar-server/evolution-calendar.desktop.in b/src/calendar-server/evolution-calendar.desktop.in
deleted file mode 100644 (file)
index 1e34997..0000000
--- a/src/calendar-server/evolution-calendar.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Evolution Calendar
-Exec=evolution -c calendar
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=evolution
-NoDisplay=true
-Type=Application
-StartupNotify=true

diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
index 8b4ef411c896ad3cb7b8c2c8e8d69a2a0c43dbf5..4b92ca5032cfd01668342f79d30331c61ffed933 100644 (file)
--- a/src/calendar-server/meson.build
+++ b/src/calendar-server/meson.build
@@ -26,12 +26,3 @@ configure_file(
   configuration: service_data,
   install_dir: servicedir
 )
-
-i18n.merge_file(
-  input: 'evolution-calendar.desktop.in',
-  output: 'evolution-calendar.desktop',
-  po_dir: po_dir,
-  install: true,
-  install_dir: desktopdir,
-  type: 'desktop'
-)